Backport some fixes from esp-idf-v5.1 #7762
+110
−32
We went looking everywhere, but couldn’t find those commits.
Sometimes commits can disappear after a force-push. Head back to the latest changes here.